bitkeeper revision 1.1236.1.132 (4244ed83AbtrXuARZAN3FYhYSFTm7w)

Catch up to latest xeno-unstable

diff --git a/xen/arch/ia64/domain.c b/xen/arch/ia64/domain.c
index d955efa3f472dadfaf8c598409a724d2a71989bf..5c3aa5b475ec03ad6fa9f93f90a8eba71b04b162 100644 (file)
--- a/xen/arch/ia64/domain.c
+++ b/xen/arch/ia64/domain.c
@@ -109,7 +109,8 @@ void startup_cpu_idle_loop(void)
        /* Just some sanity to ensure that the scheduler is set up okay. */
        ASSERT(current->domain == IDLE_DOMAIN_ID);
        domain_unpause_by_systemcontroller(current->domain);
-       __enter_scheduler();
+       raise_softirq(SCHEDULE_SOFTIRQ);
+       do_softirq();
 
        /*
         * Declares CPU setup done to the boot processor.

diff --git a/xen/include/asm-ia64/debugger.h b/xen/include/asm-ia64/debugger.h
index da06432b9c84655e5dceea6f0ff826f8a6dc8832..459b7c2695d80258aa730f0690ba70e6b3af0318 100644 (file)
--- a/xen/include/asm-ia64/debugger.h
+++ b/xen/include/asm-ia64/debugger.h
@@ -22,6 +22,8 @@
 #ifndef __ASM_DEBUGGER_H__
 #define __ASM_DEBUGGER_H__
 
+#include <xen/softirq.h>
+
 /* The main trap handlers use these helper macros which include early bail. */
 static inline int debugger_trap_entry(
     unsigned int vector, struct xen_regs *regs)

diff --git a/xen/include/asm-ia64/flushtlb.h b/xen/include/asm-ia64/flushtlb.h
index beddd632f8a61b4d1484f0610da947be5e10f6ff..19c5c569e82202e2efbd4da263078de4528b4c7c 100644 (file)
--- a/xen/include/asm-ia64/flushtlb.h
+++ b/xen/include/asm-ia64/flushtlb.h
@@ -8,6 +8,7 @@ extern u32 tlbflush_clock;
 extern u32 tlbflush_time[NR_CPUS];
 
 #define tlbflush_current_time() tlbflush_clock
+#define tlbflush_filter_cpuset(x,y) (0)
 #define NEED_FLUSH(x, y) (0)
 
 #endif